Always set focus mode first before applying scene mode

Patching Bryce CL into Denali.

  Bug: 9577903

Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
1 file changed