Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev
am: bb24c6b501

Change-Id: I4a13c7e18dbfc1a136d2a7b766d4b1259f18ff0e