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

Change-Id: Ia5ab39f9123316ac8b386fd84c69a02e8ba18d0b