Merge "Fix lock screen flash when transitioning from hub to edit mode" into main