Merge "Revert to passing mIsStashed to StashedHandleViewController again" into main