Merge "Add white edgelights to AOSP" into qt-dev