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

Change-Id: I6a3acbb7c8b71c194f93fbe69f2aa6cf011ccdeb