Fixed a bug where children were not / incorrectly userlocked

This can lead to all sorts of weird behavior

Bug: 24866646
Change-Id: If3395c5f1b524592cd658a57ac91d2a0fe893011
1 file changed