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