Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev