Merge "Fix dialog pop up when click disabled battery saver tile"