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

Change-Id: I12e1586a3c1a7a9e506db822c3a779f7c633c50d