Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev