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

Change-Id: Iaef4a6566cbccf0e9b29cf57093ad2682ea598a4