Merge commit 'cd3a02425179ea881f3534d687c143a2ce683684' * commit 'cd3a02425179ea881f3534d687c143a2ce683684': Unhide Camera lock and unlock API.