am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev

* commit '1c903b4e110a60da115acf6f94cdc50fd9e6cd62':
  Fixing regression in screen pinning button visibility. (Bug 18390050)