Merge "DisplayConfig: Add flag-protected option to select Fusion Proximity sensor." into main