Merge "Optimize initialization of configuration when display ready" into main