Merge "Enable ThemeOverlayController on TV" into tm-dev