Merge "Do not force review of hidden permissions"