Merge "Add focused display option to shade display developer option" into main