Merge "Tweak ApplicationsState for use by TvSettings" into mnc-dev