Merge "Prevent QSB from being a part of the icon reveal animation." into tm-qpr-dev