Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev