Merge "Remove zen_mode_condition from SystemUI layouts" into udc-qpr-dev