Merge "Merge "Add white edgelights to AOSP" into qt-dev am: 0bcd698481 am: 673025967c" into qt-r1-dev-plus-aosp