Merge "Update GlobalActionPanelPlugin API with lockscreen state notifications" into qt-dev am: 2f1382eaf2
am: 1a88809185

Change-Id: I665b7cda49e79f98cb42a3c00d9f21657622af8e