Merge "Add sysui feature flags for two dream features." into udc-qpr-dev