Merge "Fix an issue on hardcoded alarm settings intent"