Merge "Change to show two footer buttons in SUW lockscreen page."