Merge "Avoid showing lockscreen when closing an activity in hub mode." into main