Merge "Re-query for AlarmInstance state in AlarmActivity onResume." into ub-deskclock-army