Merge "display: Add a property to disable factory floor mode" into display.lnx.5.1