fix merge/quicksettings, fast charge

Change-Id: I1a0d2a4c5f8130a8692d2b329fd445d7b6195f7a