Merge branches 'sh/earlytimer' and 'sh/shmobile-r2r-staging'