Merge \"Fix ugly flash between boot animation and setup wizard (1/2)\" into nyc-mr1-dev
am: 9711521e3c

Change-Id: Ibe1410573df0d661ae62e45ff798bfbcc0079a1a