Merge "Fixed several time related states for secondary users" into lmp-mr1-dev