am 63faec47: Merge "Add more options to Quick Controls on phone" into ics-mr1

* commit '63faec479010e77762d5ffa517fdc65f3474383c':
  Add more options to Quick Controls on phone