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