Revert "Changing initial and default focus behavior"

This is a soft revert.

This reverts commit 37df2dbab124452e04bf14784df9ab5c2f64e434

Change-Id: I7ac08c0ef514f7ce7a0b750e501a5333f4ffb6d2
(cherry picked from commit cfd6c85d4203ca2530ddff048654b365b346eefd)
1 file changed