Merge "Fix missing overlay values" into qt-dev am: a2046c0576
am: 87752e9988

Change-Id: I1ac9f5e616fb233b7a17ae539bd9e703fe83e5dc