Merge "Introduce new changes to UI"