Merge "Don't flash "No apps" while loading permissions screens on TV" into mnc-dev