Merge "Fix expanding and scrolling in AlarmClockFragment." into ics-ub-clock-amazon