Merge "Override app requested orientation when docked." into ics-mr1