am 3da888d1: Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens

* commit '3da888d17c020b39ba36dbc99b681bf3339d269f':
  Disabling auto addition of managed profile shortcuts