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

Change-Id: I028cbc5f382bcff82c29641e0df9fd71a40a8b0b