Merge "composer: add API to control display idle timer"