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

Change-Id: I974f4b85e1d48d6c22a8583657e31e4fc9835851