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