Merge "Allow OEMs to restrict access to secondary display" into pi-dev