Merge "Add status bar time for 5.1" into lmp-mr1-dev