Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0