Merge "Disable desk dock apps." into ics-mr1