Merge proposals dependent on lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-disabled-alarm-fix

1. ubuntu-clock-app-disabled-alarm-fix
2. Dependent merge proposals