Follow-up 08091667f4c7, avoid flash of unstyled content

Change-Id: I6273eb461fcf8897a77b685c36db825328bcac93
Merge "Follow-up 08091667f4c7, avoid flash of unstyled content"