Merge "Fix to launch fdn activity on clicking the fdn preference."