Merge "Show statusbar clock based on lockscreen status."