Merge "sdm: Disable rotator for non secure layer at the end of secure display"