Merge "Added back the recents button to activity over lockscreen"