Merge "Fix Gallery2's bug: When using Gallery2 player, Device sometimes enters in deep sleep by itself during video playback."
am: 76dee0e21d

Change-Id: I5c32094efd5867c41e14d3085cc38dba05314521