Merge "Revert "Decouple auto-suspend and interactive from display on/off"" into sc-dev