Merge "Uncenter aod icons for new lockscreen"