Merge "theme change needs to be synchronous so that application can create controls...