Merge "Screen lock feature added to all other screens"