Merge "Fix Activity leak and implement change notification for preferences"