Merge "Remove dynamic summaries for "Screen lock"" into pi-dev