Merge "Add TestApi to always select the app requested display mode"