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

Change-Id: I82deea94bb427afcd3810aac7d06b98a8f0807f7