Reverted incorrect behavior in Select Preferred Location screen