Merge "display: Defers Power On/Off request in case of pending CWB Teardown"