Merge "Fixed unminimizing during battery saving mode" into oc-dev
am: 5b49464dc6

Change-Id: Id5efa71298cd71bb91aa3f08fb4bfe4eff43a183