Merge "Remove the obsolete 'show legacy' option from permission screens" into mnc-dev