Merge "Set a minimum height for invocation lights" into qt-qpr1-dev am: bec44cdd6f
am: 3a5ab6c43a

Change-Id: Ie66d1cfa821ae5557605c91401b878703dd7b987