Merge "Disable landscape mode for picker" into main