Merge "Enabling automatically turning off sticky Battery Saver."