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