Merge "Show customized message for private space  while choosing lock" into main