am d3b98329: am d5713179: Merge "Override app requested orientation when docked." into ics-mr1

* commit 'd3b98329636ad089bb0b14cefa4b49d32e5ec678':
  Override app requested orientation when docked.