Merge "Fix FDN back button, restyle screen."