Merge "Use WaitForProperty() to wait for restorecon"