Merge "Close the shade when launch animation is cancelled." into sc-dev