Merge "Merge changes from topics "shelf-refactor-anv", "shelf-refactor-click" into udc-dev am: 0948e76a am: e95d807f"