Merge "Add while-idle alarm support to apidemos"