Merge "Fix Jank when factory resetting"