Merge "Merge "Allow OEMs to restrict access to secondary display" into pi-dev am: 7ba60d25 am: 26b46106"