Merge "Battery saver preliminary changes for P."