Merge commit '6b511cd1d2bc53e478405dd1a0355f700ceb878a' into display-sysintf.lnx.1.2.r3-rel