Merge "Ensure scrim visibility updated by mPrimaryBouncerToGoneTransition" into tm-qpr-dev