Merge "Check for theme change after attaching to window."