merging upstream

Lock screen support added
Touch underneath corners