Wait for theme change before finishing (if applicable)

Change-Id: Ib691bea891e105c6aff430735bd96d07091b4a02