Merge "fix multiple activation across boot"