Merge "Content description for padlock icon depending on state" into lmp-dev