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