Merge "Prepare "grant permissions" for Tv-specific view handler." into mnc-dev