Messaging: Prevent the light from being dismissed when a QM Popup wakes the device

Change-Id: I6390a7ff0fcef7e32246ee0a75e59aa46941deaf
Merge branch 'jb-mr1' of git@github.com:IceColdJelly42/android_packages_apps_Mms.git into inverted