Merge "Fix 5044158: Reduce overall memory footprint of lockscreen"