Merge "Make screenshot dismiss to the side on timeout" into sc-qpr1-dev