Merge "Use display listener instead of Intent Action for screen status" into qt-qpr1-dev
am: 28f6d34b77

Change-Id: I809b29d7c9012bb1f6ed528fa5bf5748aab8a6a1