Merge "Material design for screen pinning cling" into lmp-mr1-dev