Merge "Action Mode fixes" into lmp-mr1-ub-dev