Merge "Block assist when screenshots are disabled by policy" into mnc-dev