Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev